bitkeeper revision 1.1159.217.3 (41e3e41d3THhxhJrWMZu3Arcs8K-Rw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 11 Jan 2005 14:35:09 +0000 (14:35 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 11 Jan 2005 14:35:09 +0000 (14:35 +0000)
commitff8c9c60d09f1e943829d9143c38b54abbcbd762
tree27bbb61f97ca4c0308ddb35c2d1ce60610b9d900
parentcc819b12e1306eb0aa7785f1c654d4e91785faaa
parent5d89512faeb066cc2cbbe604690f7383a9726326
bitkeeper revision 1.1159.217.3 (41e3e41d3THhxhJrWMZu3Arcs8K-Rw)

Manual merge
linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
linux-2.6.10-xen-sparse/drivers/xen/blkfront/block.h